Always include w32font.c in the build.

diff --git a/src/ChangeLog b/src/ChangeLog
index a3e5fcd752f66fee8475f7eabdebf2ca02112143..00e1bc3369928594b8916f8d10adbc230015751e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  Jason Rumney  <jasonr@gnu.org>
+
+       * makefile.w32-in: Always include w32font.c in the build.
+       * w32font.c: Wrap in USE_FONT_BACKEND conditional.
+
 2008-03-04  Andreas Schwab  <schwab@suse.de>
 
        * Makefile.in (clean): Remove emacs-*.*.* instead of emacs-*.

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 14883fc5c901cbe8809058463444a09e855c0b44..53616da300c6d6fc37ff963aeb5c9520960768f4 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -138,10 +138,7 @@ WIN32OBJ = $(BLD)/w32term.$(O)             \
           $(BLD)/w32reg.$(O)           \
           $(BLD)/w32bdf.$(O)
 
-FONTOBJ =
-ifdef USE_FONTBACKEND
 FONTOBJ = $(BLD)/w32font.$(O)
-endif
 
 LIBS =  $(TLIB0)       \
        $(TLIB1)        \